Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 9 Oct 2012 18:28:06 +0000 (20:28 +0200)
committerEli Zaretskii <eliz@gnu.org>
Tue, 9 Oct 2012 18:28:06 +0000 (20:28 +0200)
commit61370442c4bedd0afc56b0f353330d3a3aac90fb
treeee300b585ef7a8de107af4b10d3562a6471ed1ef
parentacaebbf79addb9242987b4e7d504897ce4f96664
parent58a62e63d35fc96cbd67b81a34283a8cad48111c
Merge from trunk.
lisp/ChangeLog
src/ChangeLog
src/emacs.c
src/keyboard.c
src/makefile.w32-in
src/termhooks.h
src/w32fns.c
src/w32term.c